Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport staging-23.11] emacs.pkgs.seq: stop shadowing it #292830

Merged
merged 2 commits into from
Mar 2, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Mar 2, 2024

Bot-based backport to staging-23.11, triggered by a label in #291416.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

magit requires[1] seq 2.24.  seq from GNU Elpa satisfies that.
However, it is shadowed by the Emacs builtin one to workaround an old
bug[2] and the version of the builtin seq in Emacs 28 is only 2.23.
So magit is broken for Emacs 28 which is the default one in NixOS
23.11 and available in the unstable branch.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes #272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: #74936

(cherry picked from commit 7374ffe)
(cherry picked from commit a9cfbfd)
@github-actions github-actions bot mentioned this pull request Mar 2, 2024
13 tasks
@jian-lin jian-lin merged commit 4aaa804 into staging-23.11 Mar 2, 2024
@jian-lin jian-lin deleted the backport-291416-to-staging-23.11 branch March 2, 2024 17:14
vcunat pushed a commit that referenced this pull request Mar 7, 2024
(cherry picked from commit 4aaa804)
Let's advance this change from staging-23.11 to staging-next-23.11.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant